From 5602b8e3f13849022a77ed74062e738910fdd684 Mon Sep 17 00:00:00 2001 From: Feng Wu Date: Tue, 6 May 2014 13:51:27 +0200 Subject: [PATCH] x86: define macros CPUINFO_features and CPUINFO_FEATURE_OFFSET This patch defines macros CPUINFO_features and CPUINFO_FEATURE_OFFSET. CPUINFO_features can be used as the base of the offset for cpu features, while CPUINFO_FEATURE_OFFSET is used to define the right offset for specific CPU feature. Signed-off-by: Feng Wu Some further cleanup (both to the patch and to surrounding code). Signed-off-by: Jan Beulich --- xen/arch/x86/boot/head.S | 5 +++-- xen/arch/x86/x86_64/asm-offsets.c | 2 +- xen/include/asm-x86/asm_defns.h | 3 +++ xen/include/asm-x86/cpufeature.h | 4 ++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index ca0e97da3b..10ecf51993 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -6,6 +6,7 @@ #include #include #include +#include .text .code32 @@ -137,10 +138,10 @@ __start: mov $0x80000001,%eax cpuid 1: mov %edx,sym_phys(cpuid_ext_features) - mov %edx,sym_phys(boot_cpu_data)+CPUINFO86_ext_features + mov %edx,sym_phys(boot_cpu_data)+CPUINFO_FEATURE_OFFSET(X86_FEATURE_LM) /* Check for availability of long mode. */ - bt $29,%edx + bt $X86_FEATURE_LM & 0x1f,%edx jnc bad_cpu /* Stash TSC to calculate a good approximation of time-since-boot */ diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 9acb648427..3994f4df1f 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -160,7 +160,7 @@ void __dummy__(void) OFFSET(IRQSTAT_softirq_pending, irq_cpustat_t, __softirq_pending); BLANK(); - OFFSET(CPUINFO86_ext_features, struct cpuinfo_x86, x86_capability[1]); + OFFSET(CPUINFO_features, struct cpuinfo_x86, x86_capability); BLANK(); OFFSET(MB_flags, multiboot_info_t, flags); diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index a4601bab32..a8d09bf753 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -77,6 +77,9 @@ void ret_from_intr(void); #define ASSERT_NOT_IN_ATOMIC #endif +#define CPUINFO_FEATURE_OFFSET(feature) \ + ((((feature) >> 3) & ~3) + CPUINFO_features) + #else #ifdef __clang__ /* clang's builtin assember can't do .subsection */ diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 6a6b1ab8a8..20881c044a 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -7,7 +7,9 @@ #ifndef __ASM_I386_CPUFEATURE_H #define __ASM_I386_CPUFEATURE_H +#ifndef __ASSEMBLY__ #include +#endif #define NCAPINTS 8 /* N 32-bit words worth of info */ @@ -152,6 +154,7 @@ #define X86_FEATURE_ADX (7*32+19) /* ADCX, ADOX instructions */ #define X86_FEATURE_SMAP (7*32+20) /* Supervisor Mode Access Prevention */ +#ifndef __ASSEMBLY__ #define cpu_has(c, bit) test_bit(bit, (c)->x86_capability) #define boot_cpu_has(bit) test_bit(bit, boot_cpu_data.x86_capability) #define cpufeat_mask(idx) (1u << ((idx) & 31)) @@ -210,6 +213,7 @@ #define cpu_has_vmx boot_cpu_has(X86_FEATURE_VMXE) #define cpu_has_cpuid_faulting boot_cpu_has(X86_FEATURE_CPUID_FAULTING) +#endif #endif /* __ASM_I386_CPUFEATURE_H */ -- 2.30.2